Auto merge of #1972 - alexcrichton:update-curl, r=brson
authorbors <bors@rust-lang.org>
Tue, 8 Sep 2015 23:48:52 +0000 (23:48 +0000)
committerbors <bors@rust-lang.org>
Tue, 8 Sep 2015 23:48:52 +0000 (23:48 +0000)
Includes a fix for #1937 to not panic on downloading crates on newer OSX
versions.

Closes #1937


Trivial merge